Merge "Fix broken tests related to communication device" into tm-dev am: 37699d93

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



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