[automerger skipped] Merge ""Hide" /Android/data|obb|sanbox/ on shared...

[automerger skipped] Merge ""Hide" /Android/data|obb|sanbox/ on shared storage" into udc-dev am: c185dd8e am: d7fdca01 am: 0f365d55 -s ours

am skip reason: Merged-In I48c2ce7ff2d7fc067961ea2af0ea63818316f086 with SHA-1 cf28630a is already in history

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



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