[automerger skipped] Add Goldfish to soong name spaces of CSI products am: cc61b88880 am: b99e423306 -s ours am: 0b6596f1c8 -s ours

am skip reason: Change-Id I1ca43de02909fb1d98a79a90e2facd8bb06cc2f0 with SHA-1 cc61b88880 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/11597929

Change-Id: Iaa1d756e920386411dc46fb063db32392541a157