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

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

Change-Id: Ifbd457664d92a547359f92fe91ba203bb58ed1ef