Merge "UI Update for AOSP Emergency dialer." into tm-dev