Merge "fix android.hardware.camera2.cts.CameraManagerTest#testManagerGetDeviceIdList for TV am: 14475f7ab0" into nougat-cts-dev
am: 39f9d64276

Change-Id: I7ce5e4f6d940405e0bb4c2ddeb8b33c03a1f852c