[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: 3fdadc7e -s ours am: 2569bd55 -s ours am: c4ae8e68 -s ours

am skip reason: contains skip directive

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



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