[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: af438379ed -s ours am: 86f7264c5e -s ours am: f4fafa1d56 -s ours

am skip reason: subject contains skip directive

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

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