Merge "Revert^2 "Adding flag com.android.wm.shell.enable_taskbar_on_phones to RELEASE_CONFIG_TRUNKFOOD_STAGING."" into main