[automerger skipped] Merge "Add a helper function to query CBR package name." into rvc-dev am: 20b8e917b5 -s ours am: 1453951626 -s ours am: e8ad5287d9 -s ours am: bb830015af -s ours

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

Change-Id: I21946314ea271d6e3605860135af50d58b327d85