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

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

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

Change-Id: Ica7cf82e3d17cbe5d0577e14faa563cfbfdc9385
tree: f689c0d07e020b46eb8554ddb7edb0d64a03d42d
  1. core/
  2. services/