[automerger skipped] Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev am: a278df4aae
am: 435fa8b02a  -s ours

Change-Id: If15d45d57d0167d8467afc00f37a02a085d1f162