Merge "Added checks for AdapterView FOCUSABLE_AUTO compatibility" into oc-dev
am: 8ed048be93

Change-Id: I8b02eabff6869a634cee28b3cfb0a09900130287