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

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



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