[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: c66d3e6e32 -s ours am: fffdde5087 -s ours am: 8f571212fa -s ours am: 8cb54ae1f1 -s ours
am skip reason: Change-Id Ie293c1c84489e4a1f20972bc056f6d2af67b79b4 with SHA-1 4e646c4948 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1323634
Change-Id: I0bb8e5c145c4cac7fc72384bec31df618cd2622e
This commit is contained in: