Merge "Fix issue where expectedListenerUpdate is not stable on test runs." am: 054514cb

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



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