Merge "Reset keyguard drawn tasks in onScreenTurnedOff" into tm-qpr-dev am: 1c64df3e

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



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