[automerger skipped] Merge "Play tone when RTT upgrade received" am:...

[automerger skipped] Merge "Play tone when RTT upgrade received" am: 34d5a951 am: f7e8ed68 am: c99b509b -s ours am: f2568e17 -s ours am: d164b3aa -s ours

am skip reason: Merged-In Ib21b17d0209dde20d048b72e8d0a626e7c4c8e33 with SHA-1 f513a47a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1620670

Change-Id: I99f0ffaa1f7981527e04e1877771446e6fdb9b64