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

[automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25df am: 81d8843b -s ours am: bbc3c545 -s ours am: 06d0d7e6 -s ours am: 5e4422f8 -s ours

am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 fbb632ea is already in history

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



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