Merge "overrideflags: change local override list name" into main am: 79a45fa1

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



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