[automerger skipped] Merge "Restrict Rescue Party factory reset packages" into sc-dev am: 67306315aa am: 07fd8eaf6d -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: Ib9b7399518a62fa472abe847e1152922b392ec5f
This commit is contained in: