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

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



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