Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: aecf1fe7 am: 75518cf5 am: 308b1842

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



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