Merge "Grant apps with WRITE_MEDIA_STORAGE legacy storage appop"