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

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

Change-Id: I3da040f7760cf3bc642c7140240edd5e196f815e