Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage" into nyc-dr1-dev