Merge changes from topic "presubmit-am-e4948ef2e7224b96802a8d22f0dbd0ce" into tm-dev am: cbc41852 am: 27e58ab2

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



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