Enforce consistent user retrieval for ICS updates. am: 29b87774 am: eda3764a am: eab9d93a

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



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