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

Change-Id: Ie53f91b3e381bc4c8b1ab4afe8c66a82fc29bc73