Merge "FileSystemPermissionTest: Whitelist adsprpc-smd device"