Merge "Have buildTemplateMobileWithRatType take metered parameter" into sc-v2-dev am: 1ceeaf0b99 am: fe0c27a43b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15939044

Change-Id: Ic603b1c3db071588e57b83836350970315430436