Merge "adb: disable failing test."
am: c4876f1905

Change-Id: I7a98f460b8f92490d009d85e82d4413c83b2eb81