[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 skip reason: Merged-In I486820ca2afecc02729a56a3c531fb931c1907d0 with SHA-1 3c2a216b is already in history

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



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