[automerger skipped] Merge "Add a helper function to query CBR package name." am: 6bf3920e7d am: 2b55d161fa -s ours am: 55a5f0117f -s ours
am skip reason: Change-Id Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0 with SHA-1 1f980d3007 is in history
Change-Id: I9ccdd0e6a106e2b298122f63bb264e0032f6bfd8
This commit is contained in: