Merge "Avoid TREBLE_TESTING_OVERRIDE" am: c281055a2b am: 57a13adb2b am: 7bcfb608ee am: 65a74d67dc

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

Change-Id: I3fe3bde8ea16056b7ef622f84cf57aa8f3c41e4c