Merge "aflags: add new storage mode" into main am: d73b91fe am: 8db0f674

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



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