Merge "Avoid TREBLE_TESTING_OVERRIDE" am: c281055a2b am: 57a13adb2b

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

Change-Id: Ie0387fdf4f8864d9b4c22ea8ec2f94e76fef66be