Enforce consistent user retrieval for ICS updates. am: 29b87774 am: 537a1be1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23480081



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