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

Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25df am: 856b62f9 am: df7e8c72

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



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