Merge changes from topic "am-6fd2dcf4e74d46fcb79ed43906079fe9" into udc-qpr-dev-plus-aosp am: 41776ce7

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



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