Merge pull request #9654 from JosJuice/android-12-early Android: Early changes to adapt for Android 12
