Merge "[automerger skipped] Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91cbd am: e88b23de0b am: a98a76e53a -s ours am skip reason: change_id I61cf05a8095f9d121fafb862def8239b325a7f43 with SHA1 c7b16ca0ab is in history"