Merge "Do not split struct properties based on soong_config_variables" into...

Merge "Do not split struct properties based on soong_config_variables" into main am: 5e04e9a1 am: f9464534

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3038272



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