[automerger skipped] Merge "Deprecate cc_binary aconfigd and the controlling...

[automerger skipped] Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: a317e56e am: 08a2ef23 -s ours

am skip reason: Merged-In I4c9ab2c57b50aaeed81f8a7db39bd1f88d31605d with SHA-1 9f6234fb is already in history

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



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