Merge "Make AdapterView auto-focusable-aware" into oc-dev
am: 7d6bf45428

Change-Id: I1f44573ac5aa04c097f7d93298e27d99c54c6ce8