Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2149693 Change-Id: Ifb1497b8c212866284a9c138e58612aa7bde3f28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>