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

Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 901eda31 am: 8816bd35 am: 9dced33f

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



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