Merge "Merge "Adds explanation of MessagingStyle fields" into tm-dev am:...

Merge "Merge "Adds explanation of MessagingStyle fields" into tm-dev am: d7356c9e am: 9d1e6d54" into tm-d1-dev-plus-aosp am: 128d2f63

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18008166



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