Merge "Fix the incorrect getCallingPid() in the ActivityManagerService" into main