Merge "Downscale oversized MessagingStyle avatars" into tm-dev am: 93599ecf am: 6b6366bd am: fecb0447

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



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