Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am:...

Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d am: d4aa1b65 am: 0b255253

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



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