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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956