Merge "Replace hidden UserHandle.isApp() usage for mainline" am: c095d60582 am: 409d84773e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84658875454edbb823b549073b12d5f65c854373