[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into tm-dev...

[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into tm-dev am: d8f121a6 -s ours

am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 50946dd1 is already in history

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



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