Merge "Remove Lollipop support for InCallUI" into nyc-dev