Merge "Fix no cross-profile thumbnail animation" into tm-qpr-dev am: 95264856 am: fcbea802

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



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