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

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

Change-Id: I198c89fda234e6f49d46d23d49a404334f909930