Merge "Do not override Camera2 for targets using vanilla AOSP" into camera-SnapdragonCamera.lnx.2.0