Merge "Block subdirs of Android for SAF and normalize the path" into tm-dev...

Merge "Block subdirs of Android for SAF and normalize the path" into tm-dev am: 26fa852f am: 676f42c9 am: 2aaa50b6

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



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