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: d6152373

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



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