Merge changes from topic "am-ae82fd63cc7c46c68526cd5d650056d1" into...

Merge changes from topic "am-ae82fd63cc7c46c68526cd5d650056d1" into tm-qpr-dev-plus-aosp am: 2713eba1

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



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