Merge "Camera: fix subsec time expectation" into nougat-cts-dev