tree bfbf917959e695e657502797f858c399e6dd4377
parent ee9140e35ea5ead40ad45b4694108f0cde1f1298
parent d90c91568ffd7b82e8fad08a7a29262bc1abe3b3
author Gavin Corkery <gavincorkery@google.com> 1632759693 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632759693 +0000

[automerger skipped] Merge "Restrict Rescue Party factory reset packages" into sc-dev am: 67306315aa am: 07fd8eaf6d am: d90c91568f -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: I82cccf311903710feb60ebd933e107b6828a5a4f