Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118 am: b726bcfd65 am: a9b465c8d8 am: f9fd07e735

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

Change-Id: I45693209b358a1b1f9691d3729743688b3229172