Merge "Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev am: 6241acea am: 111918e8" into rvc-d1-dev-plus-aosp