[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into sc-dev am: d96f7b274b am: a9d401a579 -s ours am: 8a868695f5 -s ours

am skip reason: subject contains skip directive

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

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