[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: ab8f32b8 -s ours

am skip reason: contains skip directive

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



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