Merge "Add FEATURE_CAMERA_CONCURRENT to goldfish" into rvc-dev am: 17f1564efa am: 8cd2b4fb7c

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

Change-Id: I4a57c398a4bc9f997279389645fe52689fc865cb