Merge "Separate a11y and autofill view ids" into oc-dev am: c91290a6e9
am: 0da21f56e4

Change-Id: Idddd94dece2282fc09524e662646ea6a869da3ff