[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: 89e0e5d5b8
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550762 Change-Id: I8a5fb937e980fccb4deb7eed4b8f270e6321b980 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: