Avoid TREBLE_TESTING_OVERRIDE am: 56273ce0d2 am: 4a21409278 am: 970413f03f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1359802

Change-Id: Ie5a024b9668f0743f4bc592adcf105f84b1f1bbb