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

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

Change-Id: I768a2ce36e54ff66085204b6edcdcb02804fc805