Merge "libfscrypt: use __ANDROID_API_Q__ instead of pre_gki_level" am: baa8512d80

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1395130

Change-Id: I21e245bcb0d62ca76676f8407973159e33985852