Merge "Remove Lollipop support for InCallUI" into nyc-dev
am: fd70e58784

* commit 'fd70e58784fe49e321cd3a5e759da984667f5277':
  Remove Lollipop support for InCallUI