Use doReturn instead of when..thenReturn

Avoid weird mockito exceptions.

Change-Id: I9ace0a38e7df9ac360ec5fca0230ed0976761659
Fixes: 112266489
Test: run unit tests
1 file changed