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

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

Change-Id: Id1f56e447c532c81839625ccaba5e4d5f7db16aa