am c5ac27da: am 65cc75d3: am c782f8ee: merge in KFS78N (no-op)

* commit 'c5ac27da3d02d5b0aefefa518f1491870c3b05e7': (21 commits)
  De-flake WebViewTest#testSetInitialScale.
  Moving touch event into dialog bounds.
  Disabling ProGuard for acceleration tests.
  Camera2: fix CameraDeviceTest build break
  Fix CTS failures due to not including meta state
  ImageReader: Increase timeout for waitForNextImage
  ImageReader: update to remove MaxImagesAcquiredException
  media: Update ImageReader APIs
  Camera2: Remove available format check temporarily
  Camera2: Refactor ImageReader CTS test code
  Camera2: CTS test for CameraDevice class.
  Initial commit of CTS test for CameraManager class.
  Camera2: Added output auto-gen CTS CameraProperties test.
  Add ImageReader CTS test for camera
  Better activity resolution tests; AFD exceptions.
  Remove unenforced READ_EXTERNAL_STORAGE tests.
  Adding pollcheck to check if the dialog is showing
  Fix android.os CTS tests.
  Fix and expand media scanner tests.
  Fix DeviceAdminActivationTest broken by ProGuard.
  ...