Merge "Don't call setAutofillClient() on base Context if it's null." into pi-dev