[automerger skipped] Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into tm-dev am: f908901e am: f2b38806 am: e188b6c9 -s ours am: 2b018ef0 -s ours am: e22a6593 -s ours

am skip reason: subject contains skip directive

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



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