Merge aconfig files per-module am: d788b3e6 am: 48adf4a0 am: 11e76784

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



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