Merge "Fix a bug in Helper.addAutofillableIds() that was causing a crash when a view had null autofill id." into main