[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: b6240695 -s ours

am skip reason: Merged-In I2d1d33acad035610c8db365f69b7a15faa03a2d5 with SHA-1 2e356b37 is already in history

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



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