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

Change-Id: I804f2086fe6d46a13af8c9b06a8ea59f65874e56