[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa77567 -s ours am: 502d4d85 -s ours am: c93c122f -s ours

am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e1276 is already in history

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

Change-Id: I94e7dd3c69279eed12ff94f02b7b17570bd9878e