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

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

Change-Id: I65e8c1c6c99ad7d34d1c934afd31392ed275fb6a