Merge "Remove orientation restriction from Camera2SurfaceViewActivity"

        </activity>

        <activity android:label="Camera2CtsActivity"

             android:name="Camera2SurfaceViewActivity"

             android:screenOrientation="landscape"

             android:configChanges="keyboardHidden|orientation|screenSize"

             android:showWhenLocked="true"

             android:turnScreenOn="true"