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

[automerger skipped] Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: a25cf4f9 am: 2d796a17 -s ours

am skip reason: Merged-In Ie9e7132d2befbd4a907b7aa3b4e3a0de8b36775d with SHA-1 2e03a785 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3376859



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