Merge aconfig files per-module am: d788b3e6

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



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