Merge "[MS23] Remove UserHandle.getUserId dependencies"