Merge "Merge "Use withEndAction for unlocked screen off animation end action." into tm-dev am: d8100f27 am: 45762772 am: 55bfc191" into tm-qpr-dev-plus-aosp am: a2641379

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



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