[automerger skipped] Merge "Fix issue where install restrictions were not...

[automerger skipped] Merge "Fix issue where install restrictions were not properly enforced." into udc-qpr-dev am: 1ab5be20 am: 8b79175a -s ours

am skip reason: Merged-In I6c9ce43a698580d768a80e9060e0f075e3ab14d1 with SHA-1 31bf9272 is already in history

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



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