[automerger skipped] Merge "Fix regression in unfreezing the recent task list"...

[automerger skipped] Merge "Fix regression in unfreezing the recent task list" into tm-qpr-dev am: 6c1198d7 am: 2085c287 -s ours

am skip reason: Merged-In I2580dc8e8ed463c6d994f44382138ce2ba5bf890 with SHA-1 c33a13a3 is already in history

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



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