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

* commit '3c165229b0672c32979fc43ab00735d8e36a0d45':
  Fix CameraManagerTest logic.