Merge "Include phone number in incoming call intent" into lmp-dev