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

Merge "Fix issue where expectedListenerUpdate is not stable on test runs." into tm-dev am: 2385dc0b am: e20b2f64 am: 40bc7c31 am: 559b057b

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



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