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

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

Change-Id: I251415d32bbe3544f48337b4804fda41ef942f21