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

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



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