Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 88fdc661b9 am: 1e59efe271

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

Change-Id: I17298a3ff42138a1e3c98d4f3d162c6eaf49ecfa