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

Change-Id: I3f7a4640ad5116a466914a314544fc1d2f4f551e