Merge changes from topics "adbd_reboot", "adbd_verity" am: 18bbb2d821
am: b555d6ba5d

Change-Id: I0fb27189903a232b66a8cc944972ed46a3401204