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