Merge "Replace PackageManager @hide APIs" am: 18cf9c197a am: 8804e02285 am: 5503eaee00

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553db1721ab56fce663bc6db10aa23735f5788d8