Merge "Camera: another legacy video recording fix" into lollipop-cts-dev
automerge: 50f311e

* commit '50f311e575e9e6f29da2d933e9a587131da19d71':
  Camera: another legacy video recording fix