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

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

Change-Id: Iac083d8cbb4c77a4f13a20df1ee6a4675d282aa9