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

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

Change-Id: I14672094f3f432e83445f7a893e704c04e92d624