Merge "Add metered filter for API: buildTemplateCarrier" am: 287dcfbc80

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

Change-Id: Iac42f02079de5c0507209741e648b13da667fb94