Avoid TREBLE_TESTING_OVERRIDE am: 29e1ae6598 am: a4bf903470 am: 37683a2216

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12122483

Change-Id: I2e4aa56e613d5db58b017144f384059bc965932c