am 63c85b7b: Merge "Fix for not being able to return to InCallUI after accepting call via BT" into lmp-dev

* commit '63c85b7bbe13b6beea0355c5ee08790fa0284ce0':
  Fix for not being able to return to InCallUI after accepting call via BT
tree: be4ce7afed9f502dcf5d0bd715625ff302928bc9
  1. InCallUI/