Merge "[MS23] Remove UserHandle.getUserId dependencies" am: 8bc5344f95

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

Change-Id: I3e990106b20c498266b39cf9a2776baed1ccfdfd