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

[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216b -s ours am: b0ecfd2b -s ours

am skip reason: contains skip directive

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



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