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

am skip reason: Merged-In I12dc019826a07231e1ac5cbd57afc5f3ea2dd39b with SHA-1 6d72bede is already in history

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

Change-Id: I0867e09e14db39dc5ef92838b344e558c1e32db7