[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: 52fc359a -s ours am: bbba8c4a -s ours am: e0f30d4e -s ours

am skip reason: contains skip directive

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



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