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

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



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