Merge "Autofill binding permission fixes." into oc-dev am: d915c42150
am: bd67d13bfc

Change-Id: I714263ccec13b4e96f30b180340b9087f900ae0b