Merge "Fix broken tests related to communication device" into tm-dev am: 37699d9370 am: 67b722f736 am: 81be12abc7

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

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