Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: 96a56d22

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/18906703



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