Merge "Clarifies autofill lifecycle. am: 744976e298 am: af40bb0dc4" into oc-dr1-dev-plus-aosp