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

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

Change-Id: I2802905935a312d0de7c7a29d296ea49a9aff701
tree: 97fa556597279de6bda65ac8685635f8af3f3319
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/