Merge "Clear the calling uid if the call is a binder transaction call" into main