Merge "Test mts against last stable api level" am: a59a146b36 am: 9015e276aa am: a9ba6f4c25 am: 1ae2293558

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

Change-Id: Ib63f9af1a0a80d70932202c0fe0d3a3efcc6c9e5