Merge "Isolate sdk sandbox data" am: ca1b446bd0

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

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