Merge "Watch dialer should have phone permission fixed" into cw-e-dev