am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp

* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect