Merge aconfig files per-module am: d788b3e6 am: 4c803a03 am: 09e464d5

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



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