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

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

Change-Id: I1929d6d4549270854443f7844c90034f9163064e