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