Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev
am: 7a4b1f97e0

* commit '7a4b1f97e0cc395aa423d56b48b2957d8f4fd486':
  Fix CameraManagerTest logic.