am 6058a60b: Merge "Include phone number in incoming call intent" into lmp-dev

* commit '6058a60b497de4e48451e1f84721070b796052d4':
  Include phone number in incoming call intent