Merge "Call getEntryData with correct user context." into udc-qpr-dev am: 7cc06991eb am: 36875d137c

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

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