Merge "Restrict Rescue Party factory reset packages" into sc-dev am: 67306315aa

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

Change-Id: I1ce7b88a96f24e484ffecb0a5893288fe849c443