Merge "Clear calling identity when calling platformcompat"