Merge "Fix issue where install restrictions were not properly enforced." into...

Merge "Fix issue where install restrictions were not properly enforced." into udc-qpr-dev am: 1ab5be20

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



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