Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b am: fc01806b57

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

Change-Id: Ida6883962f4df67800931145b5f2ca7d47dc182e