[automerger skipped] Merge "Replace lists of aconfig modules with...

[automerger skipped] Merge "Replace lists of aconfig modules with aconfig_declarations_group" into main am: eaa3b161 -s ours

am skip reason: Merged-In Ib32c06de4f0279a17e5c65314e984265592d004c with SHA-1 8ad50832 is already in history

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



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