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

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

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