Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3

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

Change-Id: Ic6dbad40d6227a7891b5889c07471d75beea3bcc