Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev