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

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

Change-Id: I73e92e92b9b27f865939a9c2d6c6775436de17f9