Fix adb flakiness on reboot am: eec5e52ea2 am: e476e9ce34
am: bdb2107ef3

Change-Id: Ic9057e52310d08868bcb86ec649b1e489e3aaa7c