Merge "TrustManagerService: clear calling identity in isTrustUsuallyManaged()"