Merge "Read from new storage in aflags" into main am: 7e272b8b

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



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