Merge "[MS67.1] Expose registerUsageCallback with template" am: a88cab0f1f am: 3d505ef365

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

Change-Id: Iaadb1473872bcefa2f99d76a79000559cbfd82a0