Merge "DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storage" into...

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

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



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