Merge "Fix a debuggerd test expectation."
am: dbc4aa1ded

Change-Id: Ic415ee262efa603fadfee7e2e95ef7ed36d6f966