[automerger skipped] Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3 am: 386e1702a5 am: 64416e9b01 am: 201e944eed -s ours

am skip reason: Merged-In I859514b93705f9ee4f9ae4b0bcddcb61005a78ff with SHA-1 21b13bb81b is already in history

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

Change-Id: Iaf9e421b7c83429027c09ed70bf2b60bc837a4a0