Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I323966094ad9d4c62f0a744de762dfb25d4c7c09