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

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

Change-Id: I46d8d8f0d9b83fb0a817a3455cbbc28d558b871c
tree: c7608787d8bee7ce799bbcc39ef6c6df82b0f7d6
  1. core/
  2. services/