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

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

Change-Id: I214b7cb883640a8ec848303741d4c385340957ac