Merge "Camera: Handle duplicate camera Id due to openLegacy support" into stage-aosp-master