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

Change-Id: Ie4584be34011b927b4e1cda60542390373f65ba2