Merge "Isolate sdk sandbox data" into tm-qpr-dev am: 3af097687d

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

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