Merge "Use PRODUCT variable for default payload fs type" into main am: 876264b4 am: e4ebb27c

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



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