am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev

* commit '80a90efcbf32b30b886380c67585ddfb41c35437':
  Fix ring volume issue by addressing focus regression in keyguard.