Merge "aconfig: create flag.map storage file" into main am: 9b5d19bd am:...

Merge "aconfig: create flag.map storage file" into main am: 9b5d19bd am: 365a8024 am: 82b8641b

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



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