Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for...""...

Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."" into main am: 4301e29a

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



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