Merge changes from topic "am-ba439323ed2d4083919772fbe6e679d6" into tm-qpr-dev-plus-aosp am: 6cf136e2

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



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