Merge pull request #10212 from JosJuice/android-12 Android: Increase targetSdkVersion to 31 (Android 12)