Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: db80953238 am: f716e1e0ce

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3376683

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