Merge "Fix regression in unfreezing the recent task list" into tm-qpr-dev am: 6c1198d779

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

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