Merge "Avoid TREBLE_TESTING_OVERRIDE" am: c281055a2b

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

Change-Id: I8eaa21106ca43d19c72aaeb3ea8c49229aa32eda