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

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



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