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

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



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