Merge "Merge "Improved dump() on Autofill UI." into oc-dev am: 1f74edd2d7" into oc-dev-plus-aosp