Merge changes from topic "am-6c64ec0d09b142c78bff33f7e98a7114" into tm-qpr-dev-plus-aosp am: 06062971

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



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