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

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

Change-Id: Ibf8205d025792263fd09f4c13e085a20cb2a4e00