Merge "[automerger skipped] Merge "Migrate suspend HAL interactions to new...
Merge "[automerger skipped] Merge "Migrate suspend HAL interactions to new suspend control AIDL." am: a65ac91c am: e88b23de am: a98a76e5 -s ours am skip reason: change_id I61cf05a8095f9d121fafb862def8239b325a7f43 with SHA1 c7b16ca0 is in history"