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

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



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