[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 3c2a216bbb -s ours am: b0ecfd2b86 -s ours am: 280948fb1c -s ours am: 32db633219 -s ours am: 5ece21f598 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28559202 Change-Id: Ic9eb1125bfa1368f18b15fbee4aaea041daf5966 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: