Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4

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

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