Fix edrive issue 64 65

Fix an issue in a test in class "OperationManagerService": I replace a "OR" by a "AND" in a test. I also remove code which was useless because it was a doublon.

It isn't blocking and no clear difference should be found.

Tested and validated with Nougat.

THIS is Ready