Merge "Fix incorrect Power destruction" am: 3af4111932 am: ab4954afe9 am: 40221ce02e

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

Change-Id: I42598bd8c80c6369d5fa6f00ce75118b2e4fb8d0