Merge "Simplify aconfig_declarations_group" into main am: 791733fa

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



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