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

[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0e903bfe -s ours am: 8a7b910b -s ours

am skip reason: contains skip directive

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



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