Merge "Have buildTemplateMobileWithRatType take metered parameter" am: 1c4d67b35b am: 3b9f70f655 am: 38f8607d5a

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

Change-Id: Ieb0766d4f148b98a21ef58c954bc3c49cbcef14f