Merge ""Hide" /Android/data|obb|sanbox/ on shared storage" into udc-dev am: c185dd8e7e am: 3df6bfda80

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

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