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 am: 0f6c95d4

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

Change-Id: If0c770aabefcc0644045ec272a32a1bfae022182