[automerger skipped] Merge "PowerManagerService: Use AIDL Suspend HAL" into stage-aosp-master am: 2361703653 -s ours am: 16fb9d9cf9 -s ours am: 0a3eeef602 -s ours
am skip reason: Merged-In I338804d98fea32bf5481a335a77484c1418e1b82 with SHA-1 ae77d25902 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727722
Change-Id: I6fd715446116a949d2f65467eee3b629a1200a1b
This commit is contained in: