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

[automerger skipped] Merge changes from topics "td_based_caps", "urllc_embb" am: 6ddc0548 am: 3e47ef8b am: cc5442ba -s ours am: d55ceb53 -s ours

am skip reason: Merged-In Ia6d79d10f39f998cfc35ab56ec625c6ec7e4b990 with SHA-1 fc700a37 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2033127

Change-Id: I541b49c76d5e93757e4cfcd7723d06ae945a753a