Revert "Use TREBLE_TESTING_OVERRIDE only in FMQ unit test client." am: 9ddfcaefae
am: d7937c1cbe

Change-Id: Ic2e74e74236d862b2395592b59d8b5ca0d9a8da7