[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: c9d2588c69
-s ours am: b3f4ad63ea
-s ours am: fa44fa018a
-s ours am: 77f4888ead
-s ours am: 76c9face76
-s ours am: 0551ff91fb
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762 Change-Id: Id832d2d568546252f35e3cca03d26acab6c0f6dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: