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: Ifc08d7dd4028c79313fedda0165563faae7e3140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>