Merge "Add metered filter for API: buildTemplateCarrier" am: 4c7cc726d1 am: 1851af8e93

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

Change-Id: I46d8d8f0d9b83fb0a817a3455cbbc28d558b871c
tree: decf1779d2b169b614e0f26e1c5796d7702c7770
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING