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

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

Change-Id: Iced5c9c348ec60f202e215581e5713874d65a9a2