Reverted some of the 'Fix Android 11/12 crash'
Fixes the storage access issue which is caused if targetSDK is version 30 or later. Reverting for now
Fixes the storage access issue which is caused if targetSDK is version 30 or later. Reverting for now