Merge "Fix recents thumbnail wrong while swipe up" into tm-dev am: 0b87da71...

Merge "Fix recents thumbnail wrong while swipe up" into tm-dev am: 0b87da71 am: 8a0bd59c am: 66f84326

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



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