Merge "Add support for Predictive Back in WorkLockActivity" into tm-qpr-dev...

Merge "Add support for Predictive Back in WorkLockActivity" into tm-qpr-dev am: dabfa353 am: b2ba4d0f

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



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