Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into sc-dev am: d96f7b27

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



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