[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-d1-dev-plus-aosp am: 63e827cc am: babe2391 -s ours
am skip reason: Change-Id Id1e77abc4df88a3d5c3f28b366a7dfb415a2bbb0 with SHA-1 6c99ce67 is in history
Change-Id: I9f5924ccb7b4012a032505593d5d7e86f27c5f6b