[automerger skipped] Merge "Disallow device admin package and protected...

[automerger skipped] Merge "Disallow device admin package and protected packages to be reinstalled as instant." into sc-dev am: b5d26f69 am: 1c656694 am: 54749a90 -s ours am: 55496f95 -s ours

am skip reason: Merged-In Ib1ed417072a3e942284e267e660631bd9e863248 with SHA-1 691d163e is already in history

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



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