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

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

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