Merge changes from topic "aconfig-codegen-ownership" into main am: ca2175d3 am: d095d94f

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



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