Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: da61ad69 am: 11dc2a52 am: 9295cbb3

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



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