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

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

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