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: Ib134b933128aeeef8cf7d3755f8a956f75d9dc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>