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

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

Change-Id: I7a44bd1c3b6f443db6177d7901e08543e229ba49