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

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



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