Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 88fdc661b9

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

Change-Id: I27bb7be59b4347683484f7a849532bde22e6d062