Merge "Update dependencies for new aconfig flag storage" into main am: 175e75876b am: dd47876f7f

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

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