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

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

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



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