[automerger skipped] DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage am: 364ba60e06 am: 9138457f18 -s ours am: 10a3f10edc -s ours am: a7a1d9d3b0 -s ours am: e8f3810a3f -s ours am: 22628e011d -s ours am: 64a9354880 -s ours am: 37cbb558fd -s ours

am skip reason: subject contains skip directive

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

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