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

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

Change-Id: If2270e0cc8d249966ba7862b22d322ec20b3045b