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

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

Change-Id: I7a44bd1c3b6f443db6177d7901e08543e229ba49