Merge "[MS41.1] Prepare for APIs for querying usage with template" am: 22c1481659 am: 39f1142822

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

Change-Id: Ic526e4f23bf78b9ab4ecc20884369b4386c2dc52
tree: e234c69f6098cea24a718d9c8c0e63f3f9c13e99
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/