[automerger skipped] Merge changes from topics "td_based_caps", "urllc_embb"...

[automerger skipped] Merge changes from topics "td_based_caps", "urllc_embb" am: 660fc18a am: d2222980 am: b19d53a3 -s ours am: 1cfba0af -s ours

am skip reason: Merged-In I5d30c514369e6f520abe90f214075c24d8a786d4 with SHA-1 6c21f8b5 is already in history

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

Change-Id: I61682dc20ff5225d36c1af3cc9c092449ec03bbc