Merge "remove system_ext aconfig_flags.pb look up" into main