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 am: 6cfb1e3a am: 63834572

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



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