Merge "[MS67.1] Expose registerUsageCallback with template" am: cea0daac70

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

Change-Id: I07bc5c7a099630b361eae68a1f522a73e324f148