Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3': (61 commits)
  DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4
  DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
  Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
  DO NOT MERGE: Fix ION memory leak for camera2 testStillPreviewCombination tstcase
  DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure
  Increase wait timeout for ContextWrapperTest
  Change CTS verifier HifiUltrasound Tests text to be consistent with CDD text
  CTS: DO tests for DISALLOW_CONFIG_VPN
  Fix CameraManagerTest logic.
  cts: Skip encodeDecode tests when there is no needed encoder
  Stop android.print tests from executing if the device does not support print.
  DO NOT MERGE Add running time hints to CTS package config
  CameraITS: use linear tonemap in test_exposure
  TIF: Make sure that Cursor.moveToNext() is called before using Cursor
  DO NOT MERGE: Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
  Adding testConnectivityConstraintExecutes_withMobile to knownfailure list.
  DO NOT MERGE CTS version is now 6.0_r1.5
  AudioRecordTest: Remove assert check on cold input start time
  Stop android.print tests from executing if the device does not support print.
  Restrict telephony.cts.CellInfoTest to Devices with FEATURE_TELEPHONY
  ...

Change-Id: I8d670f35346bc28ec4176ae8b20ca8dc3a0d823a