Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp am: 4dbb8a63

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



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