[automerger skipped] Merge "Allow profile owners to protect packages." into...

[automerger skipped] Merge "Allow profile owners to protect packages." into tm-dev am: 20bd378d am: c64a6989 -s ours am: d99c4841 -s ours am: 2e222d70 -s ours

am skip reason: Merged-In I2d1d33acad035610c8db365f69b7a15faa03a2d5 with SHA-1 91edfc16 is already in history

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



Change-Id: Ia470a30a2d18af7dc89c2848ec722c91dc42132a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>