[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours am: fe8699e8bf -s ours am: 8fd5c4948a -s ours
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264
Change-Id: I374c704eb51e9feca3f7d661fbe12489f7552bde
This commit is contained in: