Merge changes from topic "inline-reply-animation" into tm-qpr-dev am: 02358a56 am: 33fe76ef

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



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