Merge "Block SAF directory access to /sdcard/Android"