Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev
am: 1393a2838d

Change-Id: Ifb63713dbfa2a3ebfe73da41ceeb32f58d744db0