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

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

Change-Id: I557b05a400da012b2bb9701165cb1e3ce11cf041