Backed out changeset 9dece6b7a594 (bug 1445798) for permafailing on Android lint. a=backout

mobile/android/base/locales/en-US/android_strings.dtd

@@ -282,13 +282,6 @@
 <!ENTITY pref_whats_new_notification "What\'s new in &brandShortName;">
 <!ENTITY pref_whats_new_notification_summary "Learn about new features after an update">
 
-<!-- Localization note (pref_feature_tips_notification): Title of a new toggleable setting in Settings-Notifications screen.
-     Similar to the already existing "pref_whats_new_notification"-->
-<!ENTITY pref_feature_tips_notification "Product and feature tips">
-<!-- Localization note (pref_feature_tips_notification_summary): Description of a new toggleable setting in Settings-Notifications screen.
-     Similar to the already existing "pref_whats_new_notification_summary"-->
-<!ENTITY pref_feature_tips_notification_summary "Learn more about using &brandShortName; and other &vendorShortName; products">
-
 <!-- Localization note (pref_category_experimental): Title of a sub category in the 'advanced' category
      for experimental features. -->
 <!ENTITY pref_category_experimental "Experimental features">

mobile/android/base/strings.xml.in

@@ -225,10 +225,6 @@
   <string name="pref_whats_new_notification">&pref_whats_new_notification;</string>
   <string name="pref_whats_new_notification_summary">&pref_whats_new_notification_summary;</string>
 
-
-  <string name="pref_feature_tips_notification">&pref_feature_tips_notification;</string>
-  <string name="pref_feature_tips_notification_summary">&pref_feature_tips_notification_summary;</string>
-
   <string name="pref_category_experimental">&pref_category_experimental;</string>
 
   <string name="pref_custom_tabs">&pref_custom_tabs2;</string>