Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6 am: 124f3575be

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128

Change-Id: I09a23c705c2fe0bc01c321f38c3eadb7bd1e44da