Merge "Don't release WakeLock w/o active client" into rvc-qpr-dev am: 2dd4e12e54

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55c7a9846b5faed85c32f2d7b5c7d41b4f2ed058