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

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

Change-Id: I0401859afa1fcf4767827e4c2e536abf68a7f744