Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev
am: 6cde68752c

Change-Id: Ia67129efce12d99e566c1987d653fa3956a926db