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

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



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