Merge "Merge "Consolidate isTablet logic across Launcher and SysUI" into sc-v2-dev am: cc1e94a982" into sc-v2-dev-plus-aosp