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

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

Change-Id: I4a03b98f431b696afacbb842426db3fcf9ed7421