Merge "Guard DEVICE_INITIAL_SDK_INT check with S API." into sc-dev am: 26b92d5aa7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/15328730

Change-Id: I08445148cd23cc2464adae6416c59626ed005797