am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev

* commit '3a85b6187dc6d0000f2d0efe0077b18ea83d696e':
  Don't forward media keys to the app if the phone session is active