Merge "Relax locking for startActivityInPackage()."