[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: 8c8adcaec9 -s ours
am skip reason: subject contains skip directive

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