[automerger skipped] Merge "Isolate sdk sandbox data" into tm-qpr-dev am: 3af097687d am: e10c96e1bb -s ours

am skip reason: Merged-In I79fd5967b157c711cc75e340da7411f2b2f3bf00 with SHA-1 70e4145b8c is already in history

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

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