Merge "Prune abandoned autofill sessions" into oc-dev
am: 0271dfd814

Change-Id: I3bde59a5bf68a9cf4cb328c39bdbf22292b0ed86