Merge "Aconfig rules" am: 9f96a176 am: 00ac60a7 am: 108699f6

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



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