[automerger skipped] Merge "AdbUtils rollup" into oreo-cts-dev am: b55f5fb5ab -s ours
am: 01ce33b994 -s ours
am skip reason: change_id Ic73b09c07a0c2f0f5a99191c75748d7a3e7c4dbb with SHA1 3452a777e5 is in history

Change-Id: Ic6cb7481f05b0746c4fea4f8ac194f992c1c1f02