Merge "Fix double release of ScopedWakelock" into rvc-qpr-dev am: 74896bed49 am: 81259af583

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12351750

Change-Id: I9791bd07acc6c12fef71b2e14e05249f70ab7e26