Merge "Merge "Don't release WakeLock w/o active client" into rvc-qpr-dev am: 2dd4e12e" into rvc-qpr-dev-plus-aosp am: 78f25d44

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8728f578073a308d35d4ddd7ced3a3aab2fbda63