Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2a am: 0425f9ce" into oc-dr1-dev-plus-aosp