Merge "Update dependencies for new aconfig flag storage" into main am: daa3c717

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



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