Merge changes from topic "b215583339-AnimBigPic" into tm-qpr-dev am: 70140880 am: 1c76f47c

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



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