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