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

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

Change-Id: I71a236a34be90808809c85bbe062e6452fb06afa