Merge "Remove UnixChannelFactory from preloaded-classes-blacklist" am: 620b85ae10 am: 1679129cff

Change-Id: I577d48d2a5e50f1b3fccc72ddeef62f4e77ce843