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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3065923



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