Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be733 am: f3e802f1

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

Change-Id: I269968a5dbf1a17878b02afe2eb93379965762fd