Merge "Add stub isSameTrustConfiguration API"