Merge "Make USER_CURRENT accessible by the Test" into udc-dev am: fa4ff95cb1 am: f607be8f49 am: 726ef93eb5 am: 87bb7d31be

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

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