Merge "differentiate aconfig flags and legacy flags in device config dump" into main