Merge "Make USER_CURRENT accessible by the Test" into udc-dev am: fa4ff95cb1 am: 0710a48d2b am: 8b0febf97d am: 536dfb4d8a

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

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