Merge "Use new data property to sandbox stream protos" am: c11454b4 am:...

Merge "Use new data property to sandbox stream protos" am: c11454b4 am: 2e52714b am: b499bfd1 am: baae3a9d am: aef722dd

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



Change-Id: Iad03cec3a30116f9288e260a987281e8873a9f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>