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

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

Change-Id: I3e990106b20c498266b39cf9a2776baed1ccfdfd
tree: e025f85a633f5d344f893b18a40d7ea74f331972
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/