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

* commit 'b64b56dd457d5f3bd32f4933808eb3f4629e0e83':
  Remove Lollipop support for InCallUI