[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into rvc-dev am: 1d28c47216 am: 14be502333 -s ours am: 59fc8244e8 -s ours am: 9b86ee705a -s ours am: 030ee2ca48 -s ours am: bfb7825522 -s ours am: 9867f828f0 -s ours am: d0b1e02d4c -s ours am: b03cfbafb8 -s ours

am skip reason: subject contains skip directive

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

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