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

[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into sc-dev am: d96f7b27 am: a9d401a5 -s ours am: 8a868695 -s ours am: b1dbae8a -s ours am: 4f8c216f -s ours am: bbc3a8e8 -s ours am: e63d56f3 -s ours

am skip reason: subject contains skip directive

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



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