Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
am: 5488a38465

Change-Id: I40b5124559da062bad0bdb9405aa89ef10d12597