Merge "Camera: fix wrong assertion logic" into marshmallow-cts-dev