Merge "Add BUILDING_GSI and TARGET_SUPPORTS_64_BIT_APPS to soong_config_variable:" into main am: 5ae386cdb4

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

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