Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c462736 am: 6a5b1718

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



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