Merge "[MS67.1] Expose registerUsageCallback with template" am: cea0daac70 am: 334cd679a9 am: 0484ce1f6b am: 0dc942c49e

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

Change-Id: I2802905935a312d0de7c7a29d296ea49a9aff701