Add 20 and 21 to getAndroidVersionName, better out of bounds check