[automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier"...

[automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 6fff3df4 am: aa6feb95 -s ours

am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 d9b6ed80 is already in history

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

Change-Id: Ifd58def553962ce413d77ad619aaed0e7015d216