Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08

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

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