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

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

Change-Id: I3c817f847749649e3540e3827263cc8f7184f2b3