[automerger skipped] Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3 am: 386e1702a5 am: fa4e56de74 -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: I0fcb77f1c760a56e55496bb14ce147e7ec88457c