Snap for 10147226 from 268ca205f3d2648191eacffd6685fa550fe3bb4c to udc-release am: d921817eec

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

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