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

[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod am: ff4461ae -s ours am: 7644b13b -s ours

am skip reason: Merged-In I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 with SHA-1 567e7a04 is already in history

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



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