Merge "Add deps for new aconfig flagging storage" into main am: adfb344ce1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3058842

Change-Id: I426319e9e599a26b318e5a847c84876dee222cd9
Signed-off-by: Automerger Merge Worker <[email protected]>