am a55bf067: Merge "Make non-clickable item not focusable" into lollipop-cts-dev

* commit 'a55bf0675641ebb3538c11dc16b7566a5668bbf2':
  Make non-clickable item not focusable