Merge changes from topic "revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR" into main

* changes:
  Revert^2 "Use Soong-built system/build.prop"
  Revert^2 "Add more variables for system/build.prop migration"