[automerger skipped] Merge "Remove the temporary changes." into tm-dev am:...

[automerger skipped] Merge "Remove the temporary changes." into tm-dev am: c6cab7bd am: daffab67 am: 165c8919 -s ours am: 8af90282 -s ours

am skip reason: Merged-In I8faf9cf58db7c9204193643d4fa710d6d6608d55 with SHA-1 327cfeda is already in history

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



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