Merge "Allow google dialer code to be compiled against M and N SDKs" into ub-contactsdialer-b-dev