[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev...

[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254 am: c601e32e -s ours am: 8d8f4691 -s ours am: 58c7fa1a -s ours am: 5589682f -s ours am: 382e2b6a -s ours am: 9e7d057d -s ours am: a9fad69c -s ours am: 03e06403 -s ours

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

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



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