Merge "Skip camera test on devices without a camera" into nougat-cts-dev
am: 1a69216da0

Change-Id: I33768f24fd2469f3ef4ee7029447a08652914384