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

* commit '05fe8dad42cd96eb8ec762ae87e8e33e4a965e43':
  Allow google dialer code to be compiled against M and N SDKs