Merge "Set ActivityManager to set the test callerId as the currentUserId" into main