Merge "Do not invalidate stream when the secondary outputs are changed." into...

Merge "Do not invalidate stream when the secondary outputs are changed." into sc-dev am: faea6a60 am: 61017772

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

Change-Id: I7311e73ae0c8550e356a26b1ac8060821eccb5b1