[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-d1-dev am: 6e0b3998 -s ours
am skip reason: Change-Id Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0 with SHA-1 851e1ad2 is in history
Change-Id: I332b0a128879d0d28e658f05f84b7a8f6c5d7e01