Merge "Rename mUserHandle to mUserId for better understanding" am: 8f10e0097b am: 5445a0f7ab

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

Change-Id: I2a97dd14b8534a634f8b260d8775abd64eace2d1