Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254

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



Change-Id: I8aabcb59d973c1c54d465336410d30b53ce12618
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>