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