Merge "[Telephony] Incorrect target class name" into tm-dev am: 5a45a4ed4c

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

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