[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea am: 5526853e -s ours am: ff2c282f -s ours am: a7f9adbc -s ours am: 3989351a -s ours am: 1a1ff98f -s ours

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

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



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