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: a07fa28d

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

Change-Id: Ibe74cde7ef2eea37398fb6d5abc09e2ada170ce1