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

* commit 'be05d2505d8320dbeadb275369486d10c5a10d98':