Merge changes from topics "td_based_caps", "urllc_embb" am: 660fc18a

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

Change-Id: I12d41badafc2f729c65490c98b51e6f34a9ad0b5