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

Change-Id: I8eb792a4c7be9aba16314c033132cc06ab5ca52c