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: cdcf4032 am: 794a41c3

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



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