Merge "Fix "battery saver" not in the top seaching result for indexing" into...

Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: I38c253e43ca1165916550503b13276bcf23b672a