Merge "Fix handling format based on API level accordingly." am: d626bcaf0c am: ea97b36d27

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

Change-Id: Ibd799529f6cef95614f2bef54ad8a9f59e7df125