Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07

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

Change-Id: Id701a83c714eba3d8f56401c6bb8c91a02687d27