Merge "Update callers to use buildTemplateMobileWithRatType with metered" into sc-v2-dev am: 25f4b66ced

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

Change-Id: I7dbafb7462badb4291f2f06e8d8b44d8308608ee