[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: 856b62f9 am: df7e8c72 am: 8cdecf2b -s ours am: 07435b1b -s ours

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

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



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