Merge changes from topics "remove_api_files", "remove_naming_convention" into...

Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 534e2e50 am: 426d0163 am: 1eaf6404 am: 3f2880d2 am: 6c54015e

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



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