[automerger skipped] Merge "PowerManagerService: Use AIDL Suspend HAL" am: 90f00d947d -s ours am: ea40b56458 -s ours
am skip reason: Merged-In I338804d98fea32bf5481a335a77484c1418e1b82 with SHA-1 9ce1be0f03 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1773451
Change-Id: I8656a17e0161ac4ba2f87b5f99e68d3f2d3432ae
This commit is contained in: