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

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

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

Change-Id: Ica7cf82e3d17cbe5d0577e14faa563cfbfdc9385
tree: 6ec84bf6ac75f6865c5a5765f31998b02fbe852a
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING