Merge "New Autofill API: SaveInfo.setTriggerId()"