Merge changes from topic "aconfig-remove-format-aliases" into main am: 85c9c5b8 am: ba83c9f9

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



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