[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0c097d5c0d
-s ours am: c8c879acee
-s ours am: 708a24009c
-s ours am: 965ab0d25d
-s ours am: c01f668a46
-s ours am: 0893dc73a9
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905 Change-Id: Ic47367abafe37d3ad0286e23f52e432c4c10a662 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: