[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 23b88e0724
am: 5fc9c5c21f
-s ours am: 117fb8c534
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550763 Change-Id: I6cd6d0810d2b182c016c06d62f8e094aaf0dbd42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: