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