Merge "Partially revert ag/17450859" into tm-dev am: dc9c3d02

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17484384



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