Merge "Remove the temporary changes." into tm-dev am: c6cab7bd am: daffab67

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



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