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

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



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