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

[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c -s ours am: b3f4ad63 -s ours am: 7efbf628 -s ours am: cfea05b4 -s ours am: b292a50a -s ours

am skip reason: contains skip directive

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



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