[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours am: c0f9bb1586 -s ours am: fb84346da5 -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: Ie4e5706a73cd044d29c74735c7790f092f5379d1
This commit is contained in: