[automerger skipped] Merge "Isolate sdk sandbox data" am: ca1b446b am: 1a8ac146 -s ours

am skip reason: Merged-In I79fd5967b157c711cc75e340da7411f2b2f3bf00 with SHA-1 4b0e57f6 is already in history

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



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