Merge changes from topic "am-002b3aa45a4f48d7bab006cc4c2cdf54" into tm-qpr-dev-plus-aosp am: f9dae06d

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



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