Merge "Change streaming policy implementations" into sc-dev am: 78a91deb am:...

Merge "Change streaming policy implementations" into sc-dev am: 78a91deb am: fc561934 am: 3a4eff2e

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

Change-Id: I721f68f8d35f9695081b7d4f7e3509f37b9c8560