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 am: 991488b8

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

Change-Id: I1f73df88e8e553cd6df84c3c11c93645ccc8c1d2