[automerger skipped] Merge "Restrict Rescue Party factory reset packages" into...

[automerger skipped] Merge "Restrict Rescue Party factory reset packages" into sc-dev am: 67306315 am: 70c72ca8 am: 3262776b am: f195f0ee -s ours

am skip reason: Merged-In I12dc019826a07231e1ac5cbd57afc5f3ea2dd39b with SHA-1 3fdf5c31 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853548

Change-Id: I103824bde035ee5f2271db4309561dc230aa5e57