Merge "Add flag com.android.settings.flags.resolution_and_enable_connected_display_setting_bugfix to trunk_staging." into main