Merge changes from topic "nearby-streaming-policy" into sc-dev am: 2335acd9

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

Change-Id: I2dbe281b81b87ecf394977da3e66e42dd4ac10dc