Merge "[OsuLogin, WifiDialog] Remove explicit targetSdkVersion"