Merge "manifest: add back JamesDSPManager" into q10.0

diff --combined aicp-default.xml
index b52fd9f,89a5271..34e52d7
--- 1/aicp-default.xml
--- 2/aicp-default.xml
+++ b/aicp-default.xml
@@@ -34,12 -34,10 +34,13 @@@
    <include name="aicp-caf.xml" />\r
  \r
    <!-- AICP additions -->\r
 +  <project path="device/aicp/sepolicy" name="AICP/device_aicp_sepolicy" remote="aicp" />\r
 +  <project path="device/qcom/sepolicy" name="AICP/device_qcom_sepolicy" groups="qcom,pdk-qcom" remote="aicp" />\r
 +  <project path="device/qcom/sepolicy-legacy-um" name="AICP/device_qcom_sepolicy" groups="qcom,pdk-qcom" revision="q10.0-legacy-um" remote="aicp" />\r
    <project path="frameworks/opt/aicpgear" name="AICP/frameworks_opt_aicpgear" remote="aicp" />\r
    <project path="frameworks/opt/jamesdsp" name="AICP/frameworks_opt_jamesdsp" remote="aicp" />\r
    <project path="packages/apps/AicpExtras" name="AICP/packages_apps_AicpExtras" remote="aicp" />\r
+   <project path="packages/apps/JamesDSPManager" name="AICP/packages_apps_JamesDSPManager" remote="aicp" />\r
    <project path="packages/overlays/AICP" name="AICP/packages_overlays_AICP" remote="aicp" />\r
    <project path="platform_manifest" name="AICP/platform_manifest" remote="aicp" />\r
    <project path="vendor/aicp" name="AICP/vendor_aicp" remote="aicp" />\r
@@@ -49,6 -47,7 +50,6 @@@
    <project path="external/ntfs-3g" name="LineageOS/android_external_ntfs-3g" remote="lineage" />\r
    <project path="hardware/lineage/interfaces" name="LineageOS/android_hardware_lineage_interfaces" remote="lineage" />\r
    <project path="packages/apps/Jelly" name="LineageOS/android_packages_apps_Jelly" remote="lineage" />\r
 -  <project path="prebuilts/openssl" name="LineageOS/android_prebuilts_openssl" clone-depth="1" remote="lineage" />\r
    <project path="prebuilts/tools-aicp" name="LineageOS/android_prebuilts_tools-lineage" clone-depth="1" remote="lineage" />\r
    <project path="system/tools/dtbtool" name="LineageOS/android_system_tools_dtbtool" remote="lineage" />\r
  \r