Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07 am: 6180b47f92 am: 882c640caa am: b2123d25c6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369

Change-Id: I9e33734d4bcad84c67d882f319ce904a18eaf719