Merge "Fix camera2.cts.CameraManagerTest.testManagerGetDeviceIdList for TV." into marshmallow-cts-dev
am: 96e1f8c545

* commit '96e1f8c5456959de0645ef7f0da1c9de6f37744d':
  Fix camera2.cts.CameraManagerTest.testManagerGetDeviceIdList for TV.

Change-Id: Ib37f9f0e5e5267ce8fc623549f4a1509e3756720