[automerger skipped] Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 247f5c95f0 am: 7b0ad69ff8 am: ec966b7636 -s ours
am skip reason: subject contains skip directive

Change-Id: Iac2bf0d4fa2fd7e784a0077d04752c4db7335e95
tree: 9a9cf818c73d3fd510622c345ddc9bc8f29fb6eb
  1. acdbdata/
  2. audio/
  3. blueline/
  4. bootctrl/
  5. crosshatch/
  6. dumpstate/
  7. factory-images_blueline/
  8. factory-images_crosshatch/
  9. felica/
  10. fuzzy_fastboot/
  11. gpt-utils/
  12. health/
  13. json-c/
  14. keymaster/
  15. nfc/
  16. overlay/
  17. permissions/
  18. pixelstats/
  19. powerstats/
  20. sdm845/
  21. seccomp_policy/
  22. self-extractors/
  23. self-extractors_blueline/
  24. sensors/
  25. small_hals/
  26. usb/
  27. vibrator/
  28. voice_processing/
  29. .clang-format
  30. .gitignore
  31. Android.bp
  32. Android.mk
  33. AndroidProducts.mk
  34. aosp_blueline.mk
  35. aosp_blueline_hwasan.mk
  36. aosp_crosshatch.mk
  37. aosp_crosshatch_hwasan.mk
  38. audio_effects.xml
  39. audio_platform_info_tavil_b1.xml
  40. audio_platform_info_tavil_c1.xml
  41. audio_policy_configuration.xml
  42. audio_policy_configuration_a2dp_offload_disabled.xml
  43. audio_policy_configuration_bluetooth_legacy_hal.xml
  44. audio_policy_volumes_b1.xml
  45. audio_policy_volumes_c1.xml
  46. bluetooth_hearing_aid_audio_policy_configuration.xml
  47. board-info.txt
  48. BoardConfig-common.mk
  49. CleanSpec.mk
  50. compatibility_matrix.xml
  51. compatibility_matrix_userdebug.xml
  52. component-overrides.xml
  53. config.fs
  54. default-permissions.xml
  55. default_volume_tables.xml
  56. device-blueline.mk
  57. device-common.mk
  58. device-crosshatch.mk
  59. device.mk
  60. device_framework_matrix.xml
  61. framework_manifest_userdebug.xml
  62. fstab.hardware
  63. fstab.mainline.hardware
  64. fstab.persist
  65. gps.conf
  66. graphite_ipc_platform_info.xml
  67. init.edge_sense.sh
  68. init.fingerprint.sh
  69. init.firstboot.sh
  70. init.hardware.chamber.rc.userdebug
  71. init.hardware.diag.rc.user
  72. init.hardware.diag.rc.userdebug
  73. init.hardware.mpssrfs.rc.user
  74. init.hardware.mpssrfs.rc.userdebug
  75. init.hardware.rc
  76. init.hardware.usb.rc
  77. init.hardware.wlc.rc.userdebug
  78. init.hardware.xr.rc
  79. init.insmod.blueline.cfg
  80. init.insmod.crosshatch.cfg
  81. init.insmod.sh
  82. init.logging.rc
  83. init.power.rc
  84. init.qcom.devstart.sh
  85. init.qcom.ipastart.sh
  86. init.radio.sh
  87. init.ramoops.sh
  88. init.recovery.hardware.device.rc
  89. init.recovery.hardware.rc
  90. lowi.conf
  91. manifest.xml
  92. media_codecs.xml
  93. media_codecs_omx.xml
  94. media_codecs_performance.xml
  95. media_profiles_V1_0.xml
  96. mixer_paths_tavil_b1.xml
  97. p2p_supplicant_overlay.conf
  98. powerhint.json
  99. PREUPLOAD.cfg
  100. product.prop
  101. qti_whitelist.xml
  102. recovery.wipe
  103. sec_config
  104. sound_trigger_mixer_paths_wcd9340.xml
  105. sound_trigger_platform_info.xml
  106. thermal-engine-blueline-novr-evt.conf
  107. thermal-engine-blueline-novr-prod.conf
  108. thermal-engine-blueline-vr-evt.conf
  109. thermal-engine-blueline-vr-prod.conf
  110. thermal-engine-crosshatch-novr-evt.conf
  111. thermal-engine-crosshatch-novr-prod.conf
  112. thermal-engine-crosshatch-vr-evt.conf
  113. thermal-engine-crosshatch-vr-prod.conf
  114. thermal_info_config_blueline.json
  115. thermal_info_config_blueline_evt.json
  116. thermal_info_config_crosshatch.json
  117. thermal_info_config_crosshatch_evt.json
  118. ueventd.hardware.rc
  119. uinput-fpc.idc
  120. uinput-fpc.kl
  121. utils.mk
  122. WCNSS_qcom_cfg.ini
  123. wifi_concurrency_cfg.txt
  124. wpa_supplicant_overlay.conf
  125. wpa_supplicant_wcn.conf