[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: b1dbae8a55 -s ours am: 0c1de5c293 -s ours am: 95523c1a87 -s ours am: b0213a7fbb -s ours

am skip reason: subject contains skip directive

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

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