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

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

Change-Id: I0a9cdc959def7dc157494bc30b311b09d0fcea53