am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e17 is already in history

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



Change-Id: Ie3737929b03bb869fe74c29bdba5398378f30f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>