am 4c4b2a91: (-s ours) am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

* commit '4c4b2a9120c59ed8172a0e94b4410e8f5c3143e3':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE