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

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



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