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

Change-Id: I0cad1f0124e0ab1e717d1ddaf86eaccc895812d1