[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into sc-v2-dev am: e5f05b3f -s ours am: 1e24765e -s ours am: 81548d18 -s ours am: 326d7c52 -s ours

am skip reason: contains skip directive

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



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