Merge "Fix camera2.cts.CameraManagerTest.testManagerGetDeviceIdList for TV."