Merge "TrustManagerService: Fix service binding leak" into oc-dev am: b0ebbc3d2c
am: 0a8cc3ab7c

Change-Id: I557d2ccf3be85953e54465e7691d4599465c1fb4