Merge "Build product/odm build.prop with Soong" into main am: 57ac3a18

Original change: https://android-review.googlesource.com/c/platform/build/+/3213597



Change-Id: Id80b6d3f789b45f8d2e2bff6c4bd51d8e032eadf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>