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

Change-Id: If4699479dfebd28a9535f49b20abfaa97064ed4e