Merge "Use consistent method to get current user" into tm-qpr-dev am: 305d1bc4

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



Change-Id: I7aae2b6659f3a24dbbf21c146b5a9139375f82cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>