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

Change-Id: Ifc971e81483b5bcf08c6f0af9789b88905dc17ad