Merge "Camera: remove NOT_PRESENT cameras"
am: 174df238ac

Change-Id: I2c0dd5ccd8c8a165b568563051ad42dba6082792