Merge "Add external camera support am: d66d2cfcf2 am: a2ccd8ac06 am: 1a1c150381" into rvc-qpr-dev-plus-aosp