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

[automerger skipped] Merge "Remove the temporary changes." into tm-d1-dev am: bfbcf644 -s ours am: 4f48df83 -s ours am: a5a75d13 -s ours

am skip reason: Merged-In I62fc1a359a50c05b21f5bd1750c7991f553d3fe4 with SHA-1 273df2e8 is already in history

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



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