[automerger skipped] Merge "Play tone when RTT upgrade received" am: 34d5a951b5 am: f7e8ed68c9 am: c99b509b42 -s ours

am skip reason: Change-Id Ib21b17d0209dde20d048b72e8d0a626e7c4c8e33 with SHA-1 f513a47a1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic138df6446471b6ddbb74094fbbef1450d8d4fb8