Merge "Revert "Make sigchain actually own the signal chain."" am: 89b0d93369
am: bab16576fb

Change-Id: I41911ff50cc63889208ee4153a47ac6dc8e52c86