Merge "Add new aconfig dependencies" into main