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

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



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