[automerger skipped] Merge "Fix package usage of instant app can be updated by...

[automerger skipped] Merge "Fix package usage of instant app can be updated by unprivileged app" into sc-v2-dev am: d1956470 am: b19ca516 -s ours

am skip reason: Merged-In I4ad68be5145a165e8d8c93b6d26ccf0e8bc084c3 with SHA-1 6e441b98 is already in history

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

Change-Id: Ic5b31301ca57b5f7a60f0177a0d5a71dc2c7044a