Merge changes from topic "presubmit-am-e4948ef2e7224b96802a8d22f0dbd0ce" into...

Merge changes from topic "presubmit-am-e4948ef2e7224b96802a8d22f0dbd0ce" into tm-dev am: cbc41852 am: 8eb7e147

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



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