Merge changes Ibf8910fe,I6d89b105 into marshmallow-cts-dev am: c8ec01f1ac
am: ccbafdb308

* commit 'ccbafdb308b4cbc7a0045f632aff961b0b793c20':
  DO NOT MERGE: Camera: collect camera device info in CTS
  Camera: backport CameraDeviceInfo to M