Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91cbd
am: e88b23de0b

Change-Id: Ia7ee3329eb3d7b780b4fad617d4f76a459327f73