[automerger skipped] Merge "Add a helper function to query CBR package name."...

[automerger skipped] Merge "Add a helper function to query CBR package name." into rvc-dev am: 20b8e917 am: 6d38e9cb -s ours

am skip reason: Change-Id Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0 with SHA-1 1f980d30 is in history

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

Change-Id: I994403a3466bc5db7fa195f18fd175687f52d620