Merge "Fix test error 'No static method isAtLeastS()' by adding reference in production code." into sc-dev am: 391c446b am: ed11b0e1 am: 0b79a6d0

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

Change-Id: Ic65403bd9a25d38064d2587b2ae6de88bdf2834f