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

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

Change-Id: Idb468e2ea988c71b40709f94701eb5b5e8748448