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

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



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