Android 7.1.2 Release 12 (N2G47W)
Merge "Fix VoicemailProviderTest for new columns" into nyc-mr2-dev