Merge "aconfig: add support for local override" into main am: e6b424ad am: c74aecc8

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



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