[automerger skipped] Supported traffic descriptor based network capability am: 3408e974 am: 0c1cc4cd am: 48557391 -s ours

am skip reason: Merged-In Ie1b17b10fd52400b709f8376ec971fc49a58b037 with SHA-1 f2488047 is already in history

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

Change-Id: Ic0f7822fef030b7630cd8f3c992767a3f657780a