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

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

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

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

Change-Id: I7a3bd4bde04b1238f62c1297d3921bd75b300218