tree eed1f6311c24c758ec8bd6bc88c1a944809a3f6a
parent 39d439c77c06ccaa65128c5b76c5c8f369ee4352
parent 6cfb1e3a08d75eb7178034cf3460c714be17cca4
author Jihoon Kang <jihoonkang@google.com> 1695694257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695694257 +0000

Merge changes from topics "remove_api_files", "remove_naming_convention" into main am: 901eda31b0 am: 8816bd3514 am: 9dced33f05 am: 6cfb1e3a08

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

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