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

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

Change-Id: Ic526e4f23bf78b9ab4ecc20884369b4386c2dc52