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