Merge "Add a new aconfig file for ADPF flags" into main