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

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

Change-Id: Ib7f1fab00d0e626d90748a3246e6cdce487d1e79