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

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

Change-Id: I7c5200788f409316c1c0f82fdcae3d118f1efa52