[automerger skipped] Merge "PowerManagerService: Use AIDL Suspend HAL" into...

[automerger skipped] Merge "PowerManagerService: Use AIDL Suspend HAL" into stage-aosp-master am: 23617036 -s ours am: 16fb9d9c -s ours

am skip reason: Merged-In I338804d98fea32bf5481a335a77484c1418e1b82 with SHA-1 ae77d259 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727722

Change-Id: Ieab3e204bc0c493ae364ea697b9224edbd8b4cf0