Merge "Update recent tasks order when the last resumed activity changed" into...

Merge "Update recent tasks order when the last resumed activity changed" into tm-qpr-dev am: d7f0da67

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



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