Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"