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

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