Merge "Avoid TREBLE_TESTING_OVERRIDE" am: 7c44826eab am: fd601b72ae

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

Change-Id: Ia17d6a8157eca605fe8ff457a8b4ebf1d16e1392