Merge changes from topic "am-a8eaeda526cf46149976e0ed042c558c" into tm-qpr-dev-plus-aosp am: de8bd466

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



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