Avoid TREBLE_TESTING_OVERRIDE am: 56273ce0d2 am: 4a21409278

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

Change-Id: Iedaa4d456d85fe608f186146e162dfe4187c41f4