Merge "Add a helper function to query CBR package name." into rvc-d1-dev-plus-aosp am: 63e827cc6d

Change-Id: Ie96dd0a986d29fda2ffafd8d917c13c71e61e0fb