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