Merge "Reorder battery tips priority" into sc-dev am: 6f0a0da428

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

Change-Id: Ic675151a0269f6aa0326e6dd6636e56a7920e49b