[automerger skipped] DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared...

[automerger skipped] DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage am: 2caf1b76 -s ours am: 06b5657f -s ours am: d31c43c5 -s ours am: 1f48371d -s ours am: 22431ca9 -s ours am: c04f121f -s ours am: 86ca0ba2 -s ours

am skip reason: contains skip directive

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



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