Merge "Merge "Add flag for remote streams" into sc-dev am: f9343c8b am:...

Merge "Merge "Add flag for remote streams" into sc-dev am: f9343c8b am: 1a491b2f" into sc-v2-dev-plus-aosp am: 7b1f2e8a

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

Change-Id: I31e5923189d5399242956bfaec45776b1b8c5e1f