[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 tm-dev am: 9454d5b1 am: fbb2b5b3 am: a9ec1af4 -s ours am: b333b014 -s ours am: f414a3dd -s ours am: b5b7fe48 -s ours

am skip reason: Merged-In I30244cf18aa6522361f13a1d2119ac5847939ddd with SHA-1 1e0d36fa is already in history

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



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