[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 am: 426da26b -s ours
am skip reason: Change-Id Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0 with SHA-1 1f980d30 is in history
Change-Id: Id6ced910b3c30c12cbcbb477c1ec36f7b098f42b