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

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

Change-Id: Ie10cd1aedf4b7449356cdba0f64ba6c5d088640b