Merge changes from topic "presubmit-am-b8e581973eb74fad822fd692e9c201f8" into sc-qpr1-dev am: 934aaa94 am: 279dfac9

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

Change-Id: Icc49a998bf778053bfcae6de683dacf9e1d43a65