[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours

am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history

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

Change-Id: I4a04fc1f18f6992ef15e6efa2edcfafb38be50f9