Merge "aconfig: update aconfig owners" into main am: 60eeb857 am: c64fa2e2

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



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