After upgrading WCT, which has a dependency on mocha, some of the tests
that contain both promises and callback functions had to get updated.
Mocha updated their library to throw an exception when a test injects a
callback function and returns a promise. It now throws an exception.
Instead of calling done() inside a promise, now only one or the other
can be done, so this change updates tests that did that previously.
Bug: Issue 5331
Change-Id: I9a1b8b424c5ce9ecf60df8377849629d15543285
0184d3fb58