Merge "Merge "Clarifies autofill lifecycle. am: 744976e2 am: af40bb0d" into oc-dr1-dev-plus-aosp am: ae7fa289" into oc-mr1-dev-plus-aosp