[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery...

[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e07 am: eae02208 am: 4d263156 -s ours

am skip reason: contains skip directive

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



Change-Id: I93c7078476a71303f2b5c2087125d9b08b882bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>