Merge "Don't re-lock if we're wake and unlocking." into tm-qpr-dev am: 5bd31e03 am: 4d26393b

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



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