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

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

Change-Id: I2478bae593f72eec1f9722675226c39712aa306a