[automerger skipped] Merge "Have buildTemplateMobileWithRatType take metered...

[automerger skipped] Merge "Have buildTemplateMobileWithRatType take metered parameter" am: 1c4d67b3 am: 3b9f70f6 am: 38f8607d am: d5fe948f -s ours am: a7af8d54 -s ours

am skip reason: Merged-In Ia310d90eceeb572a35ce9518de02b198cae16705 with SHA-1 66a77730 is already in history

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

Change-Id: Id9b6ad2a9f7b36a97810842696461f1cf7893e42