Merge "Add dumpsys facility and a history to TrustManagerService"