[automerger skipped] Merge "Restrict Rescue Party factory reset packages" into sc-dev am: 67306315aa am: 70c72ca8b5 am: 3262776bb2 am: f195f0ee67 -s ours
am skip reason: Merged-In I12dc019826a07231e1ac5cbd57afc5f3ea2dd39b with SHA-1 3fdf5c31f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853548
Change-Id: I103824bde035ee5f2271db4309561dc230aa5e57
This commit is contained in: