am 6aae4fec: Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev am: b3310a6054

* commit '6aae4fecd715ed7959a36bed9a2ad276bcfd2020':
  Camera: fix wrong assertion logic