Merge "Use UserHandles instead of userId integers." am: 2531219560 am: a2831e1346

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5652b8847b094ef009d3ace14948e9122339ed21