Enforce consistent user retrieval for ICS updates. am: 29b87774c1

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

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