Merge "Add metered filter for API: buildTemplateCarrier" am: 7486607f4b

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

Change-Id: Iac42f02079de5c0507209741e648b13da667fb94
tree: eb6fc5ac540e7f3b2da0d1448ee145ba91040102
  1. core/
  2. services/