Allow google dialer code to be compiled against M and N SDKs
am: 90a13e94e3

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