[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 51066935e9 -s ours

am skip reason: Merged-In I64f0e4664b26329873a449c879a2419a05362f20 with SHA-1 4cf3185a23 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/crosshatch/+/15256381

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