[automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App...

[automerger skipped] Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into udc-dev am: a64d0620 -s ours am: 1161698a -s ours am: 35914d90 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550766



Change-Id: Ib7eec0f7770c81dd1d55f21b237cd8e37035ec73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>