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

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



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