[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on...

[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into rvc-dev am: 1d28c472 am: 14be5023 -s ours am: 59fc8244 -s ours am: 9b86ee70 -s ours am: 030ee2ca -s ours

am skip reason: subject contains skip directive

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



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