Merge "Merge "Merge "Camera: fix subsec time expectation" into nougat-cts-dev am: 5d2a0f57a7" into nougat-mr1-cts-dev am: b0d25c3b29  -s ours" into oreo-cts-dev