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

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

Change-Id: I9701ec038e6d7a9b0861301a221a4efdab0953a0