Merge "Fix package usage of instant app can be updated by unprivileged app"...

Merge "Fix package usage of instant app can be updated by unprivileged app" into sc-v2-dev am: d1956470

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

Change-Id: Idd8b1f0804a387cbddbca72e6fa4c9d223e87696