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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b6bdedc099cb421b52dd35b4ccfdfaf0d9c9633