Merge "New Autofill field: FIELD_AUTOFILL_SESSION_ID" into pi-dev
am: a278df4aae

Change-Id: I5aec308555c2effc4917d62124b057d6d2ed1744