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

Merge "Fix issue where expectedListenerUpdate is not stable on test runs." am: 054514cb am: e8b23b51 am: 1c92befb am: dee59e03 am: 5eeacce0

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



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