[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea am: 5526853e -s ours am: ff2c282f -s ours am: 76ce5348 -s ours am: 0be1e471 -s ours am: 653d7a1a -s ours am: f36b02f2 -s ours am: aef62c6b -s ours am: c70bd8de -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: Icfd4c81fe3984e3a06615500358a6eddb044e574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>