Merge "Merge "Fix issue where expectedListenerUpdate is not stable on test...

Merge "Merge "Fix issue where expectedListenerUpdate is not stable on test runs." into tm-dev am: 2385dc0b am: 2f603764" into tm-d1-dev-plus-aosp am: aa576945 am: 008bae8b

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



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