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

* commit 'b53acd946d1a5dd819d2fc208176250ae636a699':
  Fix CameraManagerTest logic.