Merge "Change streaming policy implementations" into sc-dev am: 78a91deb am: b3e8ce35 am: 5208561d

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

Change-Id: I43aa607aa2edf7cc10586cf7b162ad01e528ae49