Merge "Add deps for new aconfig flagging storage" into main