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

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



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