Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 7c44826eab

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1358624

Change-Id: Ieddb0df85343f85dfb7033574f84d750995a44a2