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

Change-Id: Ia59feec4ad1a442f6ade75eab8f3e49946d9f11b