[automerger skipped] Merge "Invalidate compressed tracks when secondary...

[automerger skipped] Merge "Invalidate compressed tracks when secondary outputs are changed." am: 6a3eb80e am: bd82c306 am: 8b53717c -s ours am: 4403410e -s ours

am skip reason: Merged-In Iff6ea6f4797dbd160b1e0169f375062725a670af with SHA-1 a5281065 is already in history

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

Change-Id: I5a8101e66a0d6ac873c9ea69e919e9d99fe86064