Merge "Update WebViewAppPickerTest to sdk 26"