Enforce consistent user retrieval for ICS updates. am: 29b87774 am: 3a376747

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



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