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 am: cc5159fe

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

Change-Id: I166bb413e770aac0bcebcebe02505f288ba718c2