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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bd4ca074fc70b58194b8bd27e0e33d22cbaa1b8