[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: 280948fb -s ours am: f2e95596 -s ours am: 9c207276 -s ours am: e1963ea0 -s ours am: 96855399 -s ours

am skip reason: contains skip directive

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



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