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

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

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

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