[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into tm-dev am: f908901e am: 6c86a8bb -s ours am: 814f4a57 -s ours am: 01841a34 -s ours am: ec085d43 -s ours

am skip reason: subject contains skip directive

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



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