Merge "camera2: Implement ICameraDeviceUser::waitUntilIdle"