Merge "Use UserHandles instead of userId integers." am: f2abf2692c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If674b972d4cf28094fc21c37197ec96e94ecdbcb