Merge "Use Icon.createWithAdaptiveBitmap on >= O" into ub-contactsdialer-i-dev