FP3: MR: Fix conflicts

<?xml version="1.0" encoding="UTF-8"?>

<manifest>

  <project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />

  <project name="AlexandreRouxDanzi/device_phh_treble" path="device/phh/treble" remote="e" />

  <project name="phhusson/vendor_vndk" path="vendor/vndk" remote="github" revision="android-10.0" />

  <project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />

  <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="pie" />

  <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />

  <project name="AlexandreRouxDanzi/android_treble_build_los" path="treble_build_los" remote="e" />

  <project name="AndyCGYan/treble_patches" path="treble_patches" remote="github" revision="lineage-17.1" />

</manifest>